From 4094841f37d5013fa1b972d678857861a8f01a1d Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Thu, 24 Feb 2022 06:04:02 -0700 Subject: [PATCH] delete unused field from legacy format ff_vecs_t (#857) --- bcr.cc | 3 +-- brauniger_iq.cc | 3 +-- defs.h | 1 - delgpl.cc | 3 +-- destinator.cc | 12 ++++++------ dmtlog.cc | 4 +--- easygps.cc | 3 +-- enigma.cc | 3 +-- garmin.cc | 3 +-- garmin_txt.cc | 3 +-- garmin_xt.cc | 3 +-- gdb.cc | 3 +-- geo.cc | 3 +-- ggv_log.cc | 3 +-- ggv_ovl.cc | 3 +-- glogbook.cc | 3 +-- gnav_trl.cc | 4 +--- googledir.cc | 3 +-- gpssim.cc | 3 +-- gtm.cc | 3 +-- hiketech.cc | 3 +-- holux.cc | 3 +-- igc.cc | 3 +-- ignrando.cc | 3 +-- igo8.cc | 3 +-- ik3d.cc | 3 +-- itracku.cc | 6 ++---- lmx.cc | 3 +-- magproto.cc | 9 +++------ mapasia.cc | 4 +--- mmo.cc | 4 +--- mtk_locus.cc | 3 +-- mtk_logger.cc | 12 ++++-------- navilink.cc | 3 +-- navitel.cc | 3 +-- ozi.cc | 3 +-- raymarine.cc | 3 +-- saroute.cc | 3 +-- sbn.cc | 3 +-- sbp.cc | 3 +-- tomtom.cc | 3 +-- tpg.cc | 4 ++-- tpo.cc | 6 ++---- v900.cc | 3 +-- vcf.cc | 3 +-- wbt-200.cc | 6 ++---- xol.cc | 3 +-- 47 files changed, 60 insertions(+), 117 deletions(-) diff --git a/bcr.cc b/bcr.cc index b8bf159c1..97745e122 100644 --- a/bcr.cc +++ b/bcr.cc @@ -474,6 +474,5 @@ ff_vecs_t bcr_vecs = { nullptr, &bcr_args, CET_CHARSET_MS_ANSI, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr + NULL_POS_OPS }; diff --git a/brauniger_iq.cc b/brauniger_iq.cc index 8e449466c..71c790c1b 100644 --- a/brauniger_iq.cc +++ b/brauniger_iq.cc @@ -280,6 +280,5 @@ ff_vecs_t brauniger_iq_vecs = { nullptr, &brauniger_iq_args, CET_CHARSET_UTF8, 1 /* master process: don't convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/defs.h b/defs.h index f924ad4b2..c093020de 100644 --- a/defs.h +++ b/defs.h @@ -1036,7 +1036,6 @@ struct ff_vecs_t { QString encode; int fixed_encode; position_ops_t position_ops; - void* unused; /* TODO: delete this field */ }; [[noreturn]] void fatal(QDebug& msginstance); diff --git a/delgpl.cc b/delgpl.cc index 335584b0b..42ea14996 100644 --- a/delgpl.cc +++ b/delgpl.cc @@ -170,6 +170,5 @@ ff_vecs_t gpl_vecs = { nullptr, nullptr, CET_CHARSET_UTF8, 1 /* there is no need to convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/destinator.cc b/destinator.cc index 24c5e8b03..47e1c4661 100644 --- a/destinator.cc +++ b/destinator.cc @@ -556,8 +556,8 @@ ff_vecs_t destinator_poi_vecs = { nullptr, &destinator_args, CET_CHARSET_UTF8, 1 /* fixed */ - , NULL_POS_OPS, - nullptr}; + , NULL_POS_OPS +}; ff_vecs_t destinator_itn_vecs = { ff_type_file, @@ -575,8 +575,8 @@ ff_vecs_t destinator_itn_vecs = { nullptr, &destinator_args, CET_CHARSET_UTF8, 1 /* fixed */ - , NULL_POS_OPS, - nullptr}; + , NULL_POS_OPS +}; ff_vecs_t destinator_trl_vecs = { ff_type_file, @@ -594,7 +594,7 @@ ff_vecs_t destinator_trl_vecs = { nullptr, &destinator_args, CET_CHARSET_UTF8, 1 /* fixed */ - , NULL_POS_OPS, - nullptr }; + , NULL_POS_OPS +}; /**************************************************************************/ diff --git a/dmtlog.cc b/dmtlog.cc index 26166b465..d66534c2e 100644 --- a/dmtlog.cc +++ b/dmtlog.cc @@ -811,9 +811,7 @@ ff_vecs_t dmtlog_vecs = { nullptr, &dmtlog_args, CET_CHARSET_ASCII, 0 - , NULL_POS_OPS, - nullptr - + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/easygps.cc b/easygps.cc index dde94f4b3..d72cfb86c 100644 --- a/easygps.cc +++ b/easygps.cc @@ -218,6 +218,5 @@ ff_vecs_t easygps_vecs = { nullptr, &easygps_args, CET_CHARSET_ASCII, 0 /* CET REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/enigma.cc b/enigma.cc index 32b2707e6..6108a0e2a 100644 --- a/enigma.cc +++ b/enigma.cc @@ -225,6 +225,5 @@ ff_vecs_t enigma_vecs = { nullptr, nullptr, CET_CHARSET_ASCII, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr + NULL_POS_OPS }; diff --git a/garmin.cc b/garmin.cc index 3f207a124..f1e188ba3 100644 --- a/garmin.cc +++ b/garmin.cc @@ -1245,8 +1245,7 @@ ff_vecs_t garmin_vecs = { nullptr, &garmin_args, CET_CHARSET_ASCII, 0, - { pvt_init, pvt_read, rw_deinit, nullptr, nullptr, nullptr }, - nullptr + { pvt_init, pvt_read, rw_deinit, nullptr, nullptr, nullptr } }; static const char* d103_icons[16] = { diff --git a/garmin_txt.cc b/garmin_txt.cc index 38a4e72f6..32c0d5600 100644 --- a/garmin_txt.cc +++ b/garmin_txt.cc @@ -1410,8 +1410,7 @@ ff_vecs_t garmin_txt_vecs = { * so it doesn't attempt to re-convert any char strings including gmsd data. */ CET_CHARSET_UTF8, 0 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; #endif // CSVFMTS_ENABLED diff --git a/garmin_xt.cc b/garmin_xt.cc index 45de0e9f9..c52a2da2e 100644 --- a/garmin_xt.cc +++ b/garmin_xt.cc @@ -415,7 +415,6 @@ ff_vecs_t format_garmin_xt_vecs = { &format_garmin_xt_args, CET_CHARSET_ASCII, 0 /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/gdb.cc b/gdb.cc index 1c801d3bb..893fad71e 100644 --- a/gdb.cc +++ b/gdb.cc @@ -1863,8 +1863,7 @@ ff_vecs_t gdb_vecs = { &gdb_args, CET_CHARSET_MS_ANSI, 0 /* O.K.: changed to NON-FIXED */ /* because of utf8 strings since GDB V3 */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /*******************************************************************************/ diff --git a/geo.cc b/geo.cc index cb4b64067..da6eaa54a 100644 --- a/geo.cc +++ b/geo.cc @@ -266,6 +266,5 @@ ff_vecs_t geo_vecs = { nullptr, &geo_args, CET_CHARSET_UTF8, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr + NULL_POS_OPS }; diff --git a/ggv_log.cc b/ggv_log.cc index 0faef6224..730473a6d 100644 --- a/ggv_log.cc +++ b/ggv_log.cc @@ -281,7 +281,6 @@ ff_vecs_t ggv_log_vecs = { nullptr, &ggv_log_args, CET_CHARSET_ASCII, 1 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/ggv_ovl.cc b/ggv_ovl.cc index c862dce2b..9860d7f8a 100644 --- a/ggv_ovl.cc +++ b/ggv_ovl.cc @@ -443,8 +443,7 @@ ff_vecs_t ggv_ovl_vecs = { nullptr, &ggv_ovl_args, CET_CHARSET_MS_ANSI, 0 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/glogbook.cc b/glogbook.cc index 8dd0ba788..f381c268b 100644 --- a/glogbook.cc +++ b/glogbook.cc @@ -188,6 +188,5 @@ ff_vecs_t glogbook_vecs = { nullptr, &glogbook_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/gnav_trl.cc b/gnav_trl.cc index 7caed79e6..51097f0a1 100644 --- a/gnav_trl.cc +++ b/gnav_trl.cc @@ -152,9 +152,7 @@ ff_vecs_t gnav_trl_vecs = { nullptr, &gnav_trl_args, CET_CHARSET_UTF8, 1 /* CET - do nothing ! */ - , NULL_POS_OPS, - nullptr - + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/googledir.cc b/googledir.cc index bf5897627..97a2b5612 100644 --- a/googledir.cc +++ b/googledir.cc @@ -165,6 +165,5 @@ ff_vecs_t google_dir_vecs = { nullptr, nullptr, CET_CHARSET_UTF8, 1 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/gpssim.cc b/gpssim.cc index a7ade0980..76aaff528 100644 --- a/gpssim.cc +++ b/gpssim.cc @@ -198,6 +198,5 @@ ff_vecs_t gpssim_vecs = { nullptr, &gpssim_args, CET_CHARSET_ASCII, 0 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/gtm.cc b/gtm.cc index d0581d42f..6e864d00e 100644 --- a/gtm.cc +++ b/gtm.cc @@ -729,6 +729,5 @@ ff_vecs_t gtm_vecs = { nullptr, >m_args, CET_CHARSET_ASCII, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr + NULL_POS_OPS }; diff --git a/hiketech.cc b/hiketech.cc index b86d43d90..fddebd11d 100644 --- a/hiketech.cc +++ b/hiketech.cc @@ -292,7 +292,6 @@ ff_vecs_t hiketech_vecs = { nullptr, &hiketech_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/holux.cc b/holux.cc index 79c10ddf4..0fed1e655 100644 --- a/holux.cc +++ b/holux.cc @@ -305,6 +305,5 @@ ff_vecs_t holux_vecs = { nullptr, nullptr, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/igc.cc b/igc.cc index 54053cd9b..e1522679f 100644 --- a/igc.cc +++ b/igc.cc @@ -943,6 +943,5 @@ ff_vecs_t igc_vecs = { nullptr, &igc_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/ignrando.cc b/ignrando.cc index 5fe43a76e..578fa121e 100644 --- a/ignrando.cc +++ b/ignrando.cc @@ -289,6 +289,5 @@ ff_vecs_t ignr_vecs = { nullptr, &ignr_args, CET_CHARSET_MS_ANSI, 1 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/igo8.cc b/igo8.cc index 88cbc40cb..a221dc109 100644 --- a/igo8.cc +++ b/igo8.cc @@ -344,6 +344,5 @@ ff_vecs_t igo8_vecs = { &igo8_options, CET_CHARSET_UTF8, 1 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/ik3d.cc b/ik3d.cc index 12192f4e7..e0d344a98 100644 --- a/ik3d.cc +++ b/ik3d.cc @@ -158,6 +158,5 @@ ff_vecs_t ik3d_vecs = { nullptr, &ikt_args, CET_CHARSET_UTF8, 1 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/itracku.cc b/itracku.cc index 1f85397e7..d2eec68ed 100644 --- a/itracku.cc +++ b/itracku.cc @@ -778,8 +778,7 @@ ff_vecs_t itracku_vecs = { &itracku_args, CET_CHARSET_ASCII, 0, /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - { itracku_rt_init, itracku_rt_position, itracku_rt_deinit, nullptr, nullptr, nullptr }, - nullptr + { itracku_rt_init, itracku_rt_position, itracku_rt_deinit, nullptr, nullptr, nullptr } }; ff_vecs_t itracku_fvecs = { @@ -799,8 +798,7 @@ ff_vecs_t itracku_fvecs = { &itracku_args, CET_CHARSET_ASCII, 0, /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }, - nullptr + { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr } }; diff --git a/lmx.cc b/lmx.cc index a8164f3b7..4d3592eb2 100644 --- a/lmx.cc +++ b/lmx.cc @@ -412,6 +412,5 @@ ff_vecs_t lmx_vecs = { nullptr, &lmx_args, CET_CHARSET_UTF8, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/magproto.cc b/magproto.cc index 920d8be78..521ab9339 100644 --- a/magproto.cc +++ b/magproto.cc @@ -1594,8 +1594,7 @@ ff_vecs_t mag_svecs = { nullptr, &mag_sargs, CET_CHARSET_ASCII, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr, + NULL_POS_OPS }; ff_vecs_t mag_fvecs = { @@ -1610,8 +1609,7 @@ ff_vecs_t mag_fvecs = { nullptr, &mag_fargs, CET_CHARSET_ASCII, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr, + NULL_POS_OPS }; /* @@ -1629,6 +1627,5 @@ ff_vecs_t magX_fvecs = { nullptr, &mag_fargs, CET_CHARSET_ASCII, 0, /* CET-REVIEW */ - NULL_POS_OPS, - nullptr, + NULL_POS_OPS }; diff --git a/mapasia.cc b/mapasia.cc index 42c350701..4df50e19b 100644 --- a/mapasia.cc +++ b/mapasia.cc @@ -302,9 +302,7 @@ ff_vecs_t mapasia_tr7_vecs = { /* we can read and write tracks */ nullptr, &tr7_args, CET_CHARSET_UTF8, 1 /* FIXED - CET-REVIEW - */ - , NULL_POS_OPS, - nullptr - + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/mmo.cc b/mmo.cc index d58810a00..47c677d70 100644 --- a/mmo.cc +++ b/mmo.cc @@ -1480,9 +1480,7 @@ ff_vecs_t mmo_vecs = { nullptr, &mmo_args, CET_CHARSET_MS_ANSI, 0 - , NULL_POS_OPS, - nullptr - + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/mtk_locus.cc b/mtk_locus.cc index 454077770..156c4aa3a 100644 --- a/mtk_locus.cc +++ b/mtk_locus.cc @@ -79,8 +79,7 @@ ff_vecs_t mtk_locus_vecs = { nullptr, // exit &mtk_locus_args, CET_CHARSET_ASCII, 0 /* ascii is the expected character set */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; #define MYNAME "mtk_locus" diff --git a/mtk_logger.cc b/mtk_logger.cc index 7843a3f5b..39591da3e 100644 --- a/mtk_logger.cc +++ b/mtk_logger.cc @@ -1672,8 +1672,7 @@ ff_vecs_t mtk_vecs = { &mtk_sargs, CET_CHARSET_ASCII, 0 /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; ff_vecs_t mtk_m241_vecs = { @@ -1693,8 +1692,7 @@ ff_vecs_t mtk_m241_vecs = { &mtk_sargs, CET_CHARSET_ASCII, 0 /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /* used for mtk-bin */ @@ -1718,8 +1716,7 @@ ff_vecs_t mtk_fvecs = { nullptr, &mtk_fargs, CET_CHARSET_UTF8, 1 /* master process: don't convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; ff_vecs_t mtk_m241_fvecs = { @@ -1734,8 +1731,7 @@ ff_vecs_t mtk_m241_fvecs = { nullptr, &mtk_fargs, CET_CHARSET_UTF8, 1 /* master process: don't convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /* End file: mtk_logger.c */ /**************************************************************************/ diff --git a/navilink.cc b/navilink.cc index 6f92e2712..69cc94a0e 100644 --- a/navilink.cc +++ b/navilink.cc @@ -1208,6 +1208,5 @@ ff_vecs_t navilink_vecs = { nullptr, &navilink_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/navitel.cc b/navitel.cc index 5c9329f2c..5027c7843 100644 --- a/navitel.cc +++ b/navitel.cc @@ -141,8 +141,7 @@ ff_vecs_t navitel_trk_vecs = { nullptr, nullptr, CET_CHARSET_UTF8, 1 /* Nothing to convert */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/ozi.cc b/ozi.cc index 228122f80..3106237fc 100644 --- a/ozi.cc +++ b/ozi.cc @@ -972,6 +972,5 @@ ff_vecs_t ozi_vecs = { nullptr, &ozi_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/raymarine.cc b/raymarine.cc index d99273423..634c6a23f 100644 --- a/raymarine.cc +++ b/raymarine.cc @@ -511,6 +511,5 @@ ff_vecs_t raymarine_vecs = { nullptr, &raymarine_args, CET_CHARSET_ASCII, 0 /* should we force this to 1 ? */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/saroute.cc b/saroute.cc index a02044f4b..24086a06b 100644 --- a/saroute.cc +++ b/saroute.cc @@ -416,6 +416,5 @@ ff_vecs_t saroute_vecs = { nullptr, &saroute_args, CET_CHARSET_UTF8, 1 /* do nothing | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/sbn.cc b/sbn.cc index 71b56f728..6a2658ef6 100644 --- a/sbn.cc +++ b/sbn.cc @@ -318,7 +318,6 @@ ff_vecs_t sbn_vecs = { /* Characters are always encoded in ASCII. Even if the unit is set * to Chinese language, only ASCII characters can be entered. */ CET_CHARSET_ASCII, 0 - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**********************************************************************/ diff --git a/sbp.cc b/sbp.cc index 5921fe48c..d808ca63b 100644 --- a/sbp.cc +++ b/sbp.cc @@ -127,7 +127,6 @@ ff_vecs_t sbp_vecs = { &sbp_args, CET_CHARSET_ASCII, 0 /* ascii is the expected character set */ /* not fixed, can be changed through command line parameter */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /**************************************************************************/ diff --git a/tomtom.cc b/tomtom.cc index d72ad4a2b..1ab09122b 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -474,6 +474,5 @@ ff_vecs_t tomtom_vecs = { nullptr, &tomtom_args, CET_CHARSET_MS_ANSI, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/tpg.cc b/tpg.cc index 6e992e993..46e812e54 100644 --- a/tpg.cc +++ b/tpg.cc @@ -312,5 +312,5 @@ ff_vecs_t tpg_vecs = { nullptr, &tpg_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr}; + , NULL_POS_OPS +}; diff --git a/tpo.cc b/tpo.cc index 17729af63..cdd985deb 100644 --- a/tpo.cc +++ b/tpo.cc @@ -2109,8 +2109,7 @@ ff_vecs_t tpo2_vecs = { nullptr, &tpo2_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /* TPO 3.x format can read waypoints/tracks/routes */ @@ -2126,6 +2125,5 @@ ff_vecs_t tpo3_vecs = { nullptr, &tpo3_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/v900.cc b/v900.cc index b8e5d6c00..96cee1b85 100644 --- a/v900.cc +++ b/v900.cc @@ -376,6 +376,5 @@ ff_vecs_t v900_vecs = { nullptr, nullptr, /* args */ CET_CHARSET_UTF8, 1, /* Could be US-ASCII, since we only read "0-9,A-Z\n\r" */ - {nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}, - nullptr + {nullptr,nullptr,nullptr,nullptr,nullptr,nullptr} }; diff --git a/vcf.cc b/vcf.cc index d5dc31d96..c97b79f4d 100644 --- a/vcf.cc +++ b/vcf.cc @@ -145,6 +145,5 @@ ff_vecs_t vcf_vecs = { nullptr, &vcf_args, CET_CHARSET_ASCII, 0 /* CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/wbt-200.cc b/wbt-200.cc index 8cf0e5bc9..15d462b98 100644 --- a/wbt-200.cc +++ b/wbt-200.cc @@ -1073,8 +1073,7 @@ ff_vecs_t wbt_svecs = { nullptr, &wbt_sargs, CET_CHARSET_UTF8, 1 /* master process: don't convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; /* used for wbt-bin /and/ wbt-tk1 */ @@ -1094,6 +1093,5 @@ ff_vecs_t wbt_fvecs = { nullptr, &wbt_fargs, CET_CHARSET_UTF8, 1 /* master process: don't convert anything | CET-REVIEW */ - , NULL_POS_OPS, - nullptr + , NULL_POS_OPS }; diff --git a/xol.cc b/xol.cc index 05aafa7e7..58b0c42f0 100644 --- a/xol.cc +++ b/xol.cc @@ -308,6 +308,5 @@ ff_vecs_t xol_vecs = {ff_type_file, nullptr, &xol_args, CET_CHARSET_UTF8, - 0 , NULL_POS_OPS, - nullptr + 0 , NULL_POS_OPS }; -- 2.30.2